Get the gdk+cairo test to pass distcheck, too

2008-08-09  Sven Herzberg  <sven@imendio.com>

	Get the gdk+cairo test to pass distcheck, too

	* gdk/tests/Makefile.am: set GDK_PIXBUF_MODULE_FILE so the test can
	pick up the one created at build time
	* gdk/tests/check-gdk-cairo.c (main): delete the output files after a
	successful test run

svn path=/trunk/; revision=21048

diff --git a/ChangeLog b/ChangeLog
index 7a97f6496bd2a050f93ed2a01baa53a26d2463c3..3ebe4fef87b16c7553e04b4f27dd9de3903c459a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-09  Sven Herzberg  <sven@imendio.com>
+
+       Get the gdk+cairo test to pass distcheck, too
+
+       * gdk/tests/Makefile.am: set GDK_PIXBUF_MODULE_FILE so the test can
+       pick up the one created at build time
+       * gdk/tests/check-gdk-cairo.c (main): delete the output files after a
+       successful test run
+
 2008-08-08  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtkscale.c

diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am
index cb3570964fc07cd432f79dc81263a2d5ecad3e7f..afb9b34251568e64785e5c3198f029d7ce168c71 100644 (file)
--- a/gdk/tests/Makefile.am
+++ b/gdk/tests/Makefile.am
@@ -2,11 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 NULL=
 
-#check_PROGRAMS=check-gdk-cairo
+check_PROGRAMS=check-gdk-cairo
 TESTS=$(check_PROGRAMS)
+TESTS_ENVIRONMENT=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
 
 AM_CPPFLAGS=\
        $(GDK_DEP_CFLAGS) \
+       -I$(top_srcdir) \
        -I$(top_builddir)/gdk \
        $(NULL)
 

diff --git a/gdk/tests/check-gdk-cairo.c b/gdk/tests/check-gdk-cairo.c
index 19f49951c4c88cdc0ffca4494aa1563e52434a4f..5986c06e693777d817fe46b2c92457872120772e 100644 (file)
--- a/gdk/tests/check-gdk-cairo.c
+++ b/gdk/tests/check-gdk-cairo.c
@@ -134,6 +134,9 @@ main (int   argc,
        g_object_unref (pbuf_platform);
        g_object_unref (pbuf_imagesrf);
 
+       g_unlink ("gdksurface.png");
+       g_unlink ("cairosurface.png");
+
        return 0;
 }